Cleaned abit up