Cleaned up code more!