Cleaned up code... again