Working but code not cleaned up