Cleaning up unused functions
Writing calculated values