COMP: Fixing memory issues
STYLE: Cleanup