Some efficiency and styling