Started private var convention changes.
Removed log message, better effect end detection/routines.
FInished private variable name convention changes.
Organized imports.