Somewhat cleaned up baseplan; removed extra lines and such