CLeaned up final master