Cleaned sink code