Cleaned up code slightly more