Finally clenaed up