Cleaned out log messages
Working on sorting