1.0.0 - Code cleanup