Better indentation, consistent names