More organized code
Less parameters
Code cleanup