Added comments + General formatting!