Finish Integration with the UI, Adding Comments, Remove unecessary function, Orginized Identation