style and cleanup