slinght code cleanup