Clean code and finish first part
Merge pull request #1 from osscarlet/patch-1

Clean code and finish first part