Cleaned up stair class