deleted unused code
added align()
updated headers