Updated style and documentation