cleaner code
very clean code
Version 1 is ready!