Code clean up and headers added