Adding const and static keywords

* removing unnecessary forward declearations