Fixed Memory Management
Fixed Formatting