refactoring
adding stuff for complete, also formatting