Memory management
Added more logging
Renaming
AStyle Formatting