Proper indentation and added aliases