cleaning a bit more. Added comments