Finished style edits and testing