Updated style and bugfix