Cleaned up innecessary variables, TODO: better file system