renaming, formatting and minor refactoring
remove build target noguards
fix warnings