Cleaned up code a bit before changing computers