Cleaned up code (Cont)

Some files weren't committed.