Structed up the code, finished