Clean style Fixes #2