Cleaned up bunch of stuff