Cleaned up default code