Fixed declarations

Fixed declarations in .cpp and .h