Style improvements and add missing files