Little cleanup and fixed #5