Standardized code, added manual