Clean up, moved some thing around to possibly fix #16