Cleaned up some more, tagged all logs, removed some useless variables