Cleaned up even more code