Cleanup, format, private variables