Cleaned up final