Code fixes for formatting