Fix height issue, remove variables