dev_1.0

Please fix code-alignment and the organization of the codes to make it more easy to read :bow: 
Add line breaks when needed, but remove extra line breaks as well.