Formatting imporovements and remove variables where possible