Resolved syntax errors, improved class layout