Refactor; Syntax cleanup, Naming changes, Memory Management fixes