Code cleanup

Basic syntax cleanup