Fixes small errors and cleans up files