Cleaned stuff up and added YCM