1.0.2 - Code cleanup & preparations