Cleaned up private and protected members, const usage