Development
Use more variables
Improvments