Standardized whitespace and added convenience target