Code cleanup, commenting