Cleaned the code a little bit + better encapsulation
Source file renamed