Little bit too eager to get rid of formatting changes :-(