Made things clean by adding functions