made assertions static, cleaned stuff