Cleaned up some stuffs