Version 1.0 - cleaning