Formatting code better