pre build ready
style improvements