Made slightly more presentable and less buggy