Try to format code better