Cleaned and moved stuff around