Add spaces
Delete comments
Replace constants with getWith/Height methods