Cleaned up, results nd style now insync with server