Cleand up code
Cleand up code
Added new functionality