Fixed indentation and layout etc.